GtkHeaderBar: Fix positioning of pack-end widgets
authorMatthias Clasen <mclasen@redhat.com>
Tue, 7 Jan 2014 03:51:11 +0000 (22:51 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 7 Jan 2014 04:37:18 +0000 (23:37 -0500)
This makes the positioning of pack-start and pack-end
widgets symmetric.

gtk/gtkheaderbar.c

index bbe6faad4cdfbcaa3b2c6085c9dfd76c7221e1c7..3e0f4cdb5da91a1c18e97f2c3771fb710c878d54 100644 (file)
@@ -1040,18 +1040,8 @@ gtk_header_bar_size_allocate (GtkWidget     *widget,
       else
         x = allocation->x + allocation->width - end_width - css_borders.right;
 
-      if (packing == GTK_PACK_START)
-        {
-          l = priv->children;
-          i = 0;
-        }
-      else
-        {
-          l = g_list_last (priv->children);
-          i = nvis_children - 1;
-        }
-
-      for (; l != NULL; (packing == GTK_PACK_START) ? (l = l->next) : (l = l->prev))
+      i = 0;
+      for (l = priv->children; l != NULL; l = l->next)
         {
           child = l->data;
           if (!gtk_widget_get_visible (child->widget))
@@ -1085,10 +1075,7 @@ gtk_header_bar_size_allocate (GtkWidget     *widget,
           gtk_widget_size_allocate (child->widget, &child_allocation);
 
         next:
-          if (packing == GTK_PACK_START)
-            i++;
-          else
-            i--;
+          i++;
         }
     }